-
Notifications
You must be signed in to change notification settings - Fork 35
Build dockers #1298
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Build dockers #1298
Conversation
@lukaszstolarczuk |
6039c67
to
b1d2ec2
Compare
.github/workflows/reusable_basic.yml
Outdated
@@ -192,7 +166,6 @@ jobs: | |||
-DUMF_DISABLE_HWLOC=${{matrix.disable_hwloc}} | |||
-DUMF_LINK_HWLOC_STATICALLY=${{matrix.link_hwloc_statically}} | |||
${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' && '-DUMF_USE_COVERAGE=ON' || '' }} | |||
${{ matrix.llvm_linker || '' }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why this is removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
returned
3552ecc
to
aefd38a
Compare
.github/workflows/pr_push.yml
Outdated
|
||
jobs: | ||
CodeChecks: | ||
uses: ./.github/workflows/reusable_checks.yml | ||
FastBuild: | ||
name: Fast builds |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why the name was removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
returned
.github/workflows/detect_changes.yml
Outdated
run: | | ||
echo "Changed files: $ALL_CHANGED_FILES" | ||
|
||
RunReusableDocker: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
perhaps simply BuildDocker
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay
.github/workflows/reusable_basic.yml
Outdated
strategy: | ||
matrix: | ||
os: ['ubuntu-22.04', 'ubuntu-24.04'] | ||
ubuntu_ver: ['ubuntu-22.04', 'ubuntu-24.04'] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should probably go back to the os
name, as it contains not only the ubu ver
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay
.github/workflows/reusable_basic.yml
Outdated
- name: Install g++-7 | ||
if: matrix.compiler.cxx == 'g++-7' | ||
run: sudo apt-get install -y ${{matrix.compiler.cxx}} | ||
echo "${USERPASS}" | sudo -Sk bash -c " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some as above, perhaps sudo su
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wrote installation script to avoid multi-line bash command
runs-on: ubuntu-latest | ||
strategy: | ||
matrix: | ||
ubuntu-version: [20.04, 22.04, 24.04] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe for unity, this should also be os
(full name of the distro)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay
.github/workflows/reusable_fast.yml
Outdated
strategy: | ||
matrix: | ||
include: | ||
- os: windows-latest | ||
- ubuntu_ver: ubuntu-22.04 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same - re-name to os
please
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay
build-essential \ | ||
cmake \ | ||
git \ | ||
gnupg" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
then it should be moved to oneapi installation step
(applies to both docker files)
.github/workflows/reusable_basic.yml
Outdated
${{ matrix.install_tbb == 'ON' && matrix.disable_hwloc != 'ON' && matrix.shared_library == 'ON' && '--proxy' || '' }} | ||
--umf-version ${{env.UMF_VERSION}} | ||
${{ matrix.shared_library == 'ON' && '--shared-library' || '' }} | ||
# - name: Test UMF installation and uninstallation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and I believe it's the time to uncomment this - what's failing with that? please send me a link and we'll investigate...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not necessary, it is working :)
f15cda9
to
5705c2a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the CI is failing unfortunately - is it possible that it needs some of the fixes in docker that wasn't pushed yet?
perhaps you should split your PR into 2 - one with docker changes, and the other with the rest...?
on: | ||
pull_request: | ||
paths: | ||
- '.github/docker/*.Dockerfile' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.github/scripts dir should be added as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not done yet
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why? I added the path
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh sorry, now it is done
.github/workflows/reusable_basic.yml
Outdated
@@ -28,7 +35,7 @@ jobs: | |||
link_hwloc_statically: ['OFF'] | |||
cmake_ver: ['default'] | |||
include: | |||
- os: 'ubuntu-22.04' | |||
- os: ubuntu-22.04 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sry for being meticulous, but you could leave '
as they were here before... we'll potentially have less conflicts on any merges, and less changes here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
CONTRIBUTING.md
Outdated
If you want to rebuild existing Docker images or add a new one, you must open a separate pull | ||
request dedicated to Docker-related changes. This PR must be merged into the main branch first. | ||
|
||
Only after the PR is merged will the updated Docker images be available for use in workflows. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"The updated Docker images will be available for use in workflows only when this PR is merged."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
replaced
I added a new Docker image for Ubuntu 24.04 and updated the others. I also created two new workflows that check for changes in the Docker files. If any changes are detected, the relevant Docker image will be rebuilt and pushed (unless it's a pull request). The rebuilt images will be available after the merge.
Added UMF docker
This is the first part only for docker build. The second with updated CI : #1329
// workflow executed on fork:
https://github.com/rbanka1/unified-memory-framework/actions/runs/15134054789
https://github.com/rbanka1/unified-memory-framework/actions/runs/15134054814
I added a new Docker image for Ubuntu 24.04 and updated the others.
I also created two new workflows that check for changes in the Docker files.
If any changes are detected, the relevant Docker image will be rebuilt and pushed (unless it's a pull request).
The rebuilt images will be available after the merge.